-
Notifications
You must be signed in to change notification settings - Fork 4.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Fix] Fix jdbc registry cannot work #15861
[Fix] Fix jdbc registry cannot work #15861
Conversation
daf1629
to
6c20198
Compare
@@ -58,10 +70,39 @@ public class DaoConfiguration { | |||
public DaoPluginConfiguration daoPluginConfiguration; | |||
|
|||
@Bean | |||
public MybatisPlusInterceptor paginationInterceptor(DbType dbType) { | |||
public SqlSessionFactory sqlSessionFactory(DbType dbType, DataSource dataSource) throws Exception { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like this will create SqlSessionFactory for use, got it.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #15861 +/- ##
============================================
- Coverage 39.37% 39.35% -0.03%
+ Complexity 4972 4968 -4
============================================
Files 1347 1348 +1
Lines 45630 45660 +30
Branches 4890 4895 +5
============================================
Hits 17968 17968
- Misses 25747 25777 +30
Partials 1915 1915 ☔ View full report in Codecov by Sentry. |
.github/workflows/backend.yml
Outdated
@@ -108,8 +108,12 @@ jobs: | |||
case: | |||
- name: cluster-test-mysql |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we change this to cluster-test-mysql-with-zookeeper-registry
for better differentiation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
0c4fbd2
to
469567c
Compare
3bf6413
to
80487b7
Compare
6c52601
to
cfbe7b7
Compare
@ComponentScan(value = "org.apache.dolphinscheduler", excludeFilters = { | ||
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = JdbcRegistryAutoConfiguration.class) | ||
}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since AutoConfigureAfter
can only be used at AutoConfiguration which is not under the scan path, so we need to exclude this, we need to remove the ComponentScan here, we should scan the bean under alert, the bean in other package should be import manual.
3c7f179
to
90f5a56
Compare
90f5a56
to
a10a2be
Compare
Quality Gate failedFailed conditions |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
Purpose of the pull request
close #15854
Brief change log
Verify this pull request
This pull request is code cleanup without any test coverage.
(or)
This pull request is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
(or)
If your pull request contain incompatible change, you should also add it to
docs/docs/en/guide/upgrede/incompatible.md